Fix group reg for 8.5

A bunch of fixes so that group reg will work in 8.5. Closes #436 and also fixes #458 
Oh man, it actually is. Because that pull request wasn't merged, and because I'm chaining bug fixes on the same computer, this snuck in on this pull request.