OS reader cleanup.

#3718