Migrate legacy multi-name routines to options system

This change set is to migrate the few left-over routines with e.g. _EL and _MU variants of their name to use the options system instead.