namespace refactor.
parse var decls.
ad-hoc hack for types.