Issue #1655: Add a test (also tests other cases where we generate Callables).
Fix #1655.
Update .src for #1655