Now that we have HasDebugCallStack we can get rid of the string argument to expectNonEmpty/expectJust. It just clutters up the code.
HasDebugCallStack
expectNonEmpty/expectJust
Cf !13770 (comment 605523).