Fix some missing spots to use markup stack, move code lines, add a syntax error