Minor markup cleanups