More constness, ShapeHitList refactoring