Fixup handling of "_" prefix