Fix unyfiying. Closes gh-3.