inconsistent use of endEntry

As noted in discussions with @Serge , there are still a few places with os << token::END_STATEMENT << nl instead of using endEntry()

Having endEntry() can be useful when trying to trigger on the end event (such as with the coherent format).