Simplify register(). Closes #2131