Syntactic adjustments from @mtbc