Mass-migrate to java.util.Optional