Switch to j8 Optional.

I don't think its worth committing this yet, I just want to see what breaks!