Minor work in NonEmpty.v.comp