Update ifdefs used by default.
Make 'browser' typename non-ambiguous in entire program.