Simpler instruction wrapping