More markup syntax fixes.