One more place we need to update fn.LocalsByName
Start annotating test cases. Note need to disambiguate scope in locals. Sigh.