tidy up around finish_automount()