Fix some ambiguous cases in the "markup code" helper