Add support for optional plugins, minor fixups

Is this 'less constant' than CONFIG? If not, should be uppercase, too?