A bit of code cleanup and added F4 to reader stack.