Generalize things enough to work with the special path of the RPM mode.