You're not breaking my workflow - I was instructed to stop working on AST code, so I can't work currently until I pull your next patch. I suggest we fix this here and not merge broken windows. Since we're reviewing, it doesn't make sense to merge changes we don't like. Add a commit to this branch and I'll merge afterwards.