Since comments don't produce a context anymore, some clean up