Make registry next() insertion easier (#284).
Cleanup of methods that deal with adding to the context registry.

Closes #284.