Even more refactoring

Change-Id: I7b3ca31f2966e80ec0cb126cb8551f5be67c42b3
Whitespace cleanups

Change-Id: Iea2692ecc863679225fad1a01ff440a61dd01aec
Move register_ methods into the DSL

Change-Id: Ia354e8b4d5e527491706577a23bebec0c918604a