Split some parts of UpdateBoundingBox into multiple lines. Also,
fix issues causing failure on Lint.