First and foremost: I think that the ugly diff there is better than re-rolling the logic. Ugly is better than rerolling a critical algorithm inline.