@bcwaldon would it make sense to move all the calls to `path.Base` here and remove this? That way we could guarantee that the name is properly parsed.