Fix for #481 (and #734, duplicate). Fix for ":=" that was missed earlier.