Re-added doc tag folding.
Changed syntax style and fixed alignment code.
Added machine predicate for challenger.