Allow spaces in path tokens

This fixes missing annotations for paths that contain spaces.