Remove implicit dependency on non-default AT fields; Fix demarshalling