[masklinn]

> I wonder if there's a way to remove the extra nops?

Sure you just have to recompute all the jump destinations and patch the jumps themselves.

[userbinator]

Jump destination computation was the subject of a recent HN item:

https://news.ycombinator.com/item?id=10219007