Merge: niti: fix escaping in `with`