Swap out some usages of guava Optional with Java Optional