Fix prefix and suffix getting cleared in PEx conversion