SERVER-10026 triage and address some TODO comments, fix bounds building