Fix zero tracking over constant terms