Extract benchmarks
Tidy up unused macros
Firefox key compatibility