support spve in 1-argument version too
use proper fixup functions