(py-forward-into-nomenclature): Slightly better regex for stopping on

underscore.