got rid of a few missed uses of deprecated Optional<>::empty ()