Refactored more reader code.