tpath -> tramp-path (I like descriptive names)

(if path ...) -> (and path ...) (for consistency with the code below)