Cleanup: slightly cleaner implementation of zip/full-path