Code cleanup for Firefox.