Also, straighten out the confusing option adjuster thing when editing
an entry.

The help text still needs an overhaul, but now I have to re-test this
whole mess.