Fix #1825. We stop generating AbstractCallables with fields to hold the primary, and use a let outside the anonymous class instantiation instead
Issue #1825: Add a test
Issue #1825: Bulk update other .src affected by the fix.