j/unify: minor cleanups