Further fixes to parsing for better parsing of mixed suffix/array/function.