Minor cosmetic cleanups. Mapped F2, F3, F4.