Follow up on #674. In some places instead of using `Optional#get` we could use `Optional#orElseThrow` if we are on Java 10 or later.
