comment parsing: enabled s4 slots and cleaned up common vars

About to do a major change so this is more of a safety commit
comment: parsing complete

Clearly a bunch of tokens missing, but most of the ones we can think of
should be dealt with.