I plan on fixing some of these odd cases in a followup pull. The intention here is refactoring without any logic changes.