Updated for optional equation numbering.