Added tests (one fails) for a generalized option pool.
Fixed a bug where combined options were overly-eagerly created and would miss changes after construction.