bug 807: Some more markup changes