[panzi]

There is no single point in time where a rewrite is "more appropriate" than adding this one line of code. At least not when you have a deadline.