Enhance bounding and add integration.
Cleanup and add some runtime assertions.