Awkward singleton update support, add support for ambiguous block helpers.
Clean up subscribe method.
Attempt to clean up functionality.