Comment updates.
Add an awful hack so that with= does something for the presentation.