Rename adjustGroupNumbering to incrementGroupNumbering. Remove internal
state reference from incrementGroupNumbering to make it easier to
refactor / debug, etc.