tcm_vhost: Post-merge review changes requested by MST