Simplify a few processes. Annotate BoundBoxOfX classes to remove warnings.