Aaron, I'm currently fixing other issues with gengtype and I needed this patch on top of them. I will be rolling both patches into a single one and commit them today/tomorrow. If you were working on further fixes to this, please give me a chance to commit this one first.
Thanks. Diego.
