Switched to using array references during parsing. This makes it easier for handlers to access current buffer states