Simplify references to internal $conf where appropriate.