Fix totally mangled recurring code

I just... I.  I think I was relying on the test to do all the thinking for me.

Change-Id: Ifd24eb162c8cd5f063f4f42f61c82ac5c3b9499f
fix typo

We should move this to before the field name mangle.

Change-Id: I9c22d9ab3f28958d864ba4d65bc13cf3fa7b3a12