o Fix items from Mozilla editors review. Closes #4374.