BZ-8443 - more markup cleanup