More annoying markup fixes.