Parsing and type annotation of const
typeToStr for const
Small left-over changes