How about just making a pull request out of this and the change to optimize.c, add a test case for it, and let's get that pulled?