Dimensions now parsed correctly, arguments and constant arguments now appear to be parsed correctly