First steps in refactoring the reader macro functions.