Fix generated zero and ident subs