Reduce nesting
Fix markup value corruption by iprefix and isuffix