Improve handling of paths with spaces per #36