Removing buffer-specific parsing constructs; need to generalize in order to continue.