Huh. Well, I think you probably could have worked around the issue by just removing that line, then. Nonetheless, I think this code ends up better, so I'm happy to have the rest of the pr.