Remove use of Optional.
Add some yourkit love.