Fix invalid enum references in groupings (fixes #327) (#328) * Fix invalid enum references in groupings (fixes #327) * Remove comment, Piers didn't have any comments ¯\_(ツ)_/¯ * Reflect review comments from Jon