Better API for describe options. Fixups.