PB-661 #comment XML refactoring & clean-up