Improve Option deconstruction