nitc/niti: unify returnmark and escapemark