Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate.