Alterations to regs-site pull request #334

All of these changes are either for conciseness (JS-esque) or because there is logic elsewhere that can be reused that you understandably didn't know about.

There are a couple of renames in here as well.