Fixups for assertion goals