Add: support for type "var<type>" and "var<name:type>";
Add: a few minor improvements and fixings.