Optimize rest of Option-s

Closes https://github.com/iSerge/scala-cgdk/issues/6