This should account for all cases where we were still doing such a thing. Improvement suggested in #65 (Github issue).