Also allow underscore in path component names