Clean up the aspects, and add comments on the quirks of current usage.