Previous refactoring for adding indirection to the Jinq translation code
so as to handle Scala-specific logic wasn't working quite right. This
one should be better.