removed ad-hoc parsing; everything uses meta-reader now.