Implement `xhoist`

Also fix a few stylistic issues.