@mdboom - would it make sense to just merge this and fix this in your branch?