Lots of cosmetic changes.

Lots of small bugfixes (lint!).
Made bgn_group and end_group form methods instead of top-level functions.