Add back some potentially unsafe stuff from Optional<> - and documented why putting back. Maybe rethink again, but seems OK for now