Addressing quality issues.

Where possible, this should be done in context of making the mistake, lest it be significantly harder to do later.