Remove dependency on clj-tuple