#691 - Add more explicit CodeField support