Bump dependency versions

* xyzzy v0.1.3 => 0.1.8
Cleanup: move loc helper fns into xyzzy where they belong