Clean up discussion to account for auto-unit'ing changes.