Enhanced diminish-or-restore for less code-duplication.