Make these ASSERTs smarter about the empty string