Moved to linear parsing

Got a small performance boost too.