Added methods to Aggregation, and commented out ones to Holder. Went back to OPT in
the Option enablers because remembered I did that for Some. Dropped attempt to use
something like an explicitly DSL for holders for now.