[[ RefactorSyntax ]] Tweaks to make Mac server build (Desktop awaiting MCS_* update).