Simplify enumerating options algorithm