Thanks Zachary, I should have known those would be a problem. Please commit.
Closed by commit rL223687 (authored by @zturner).