minor reshuffling
fixup! build event on the stack then record
remove some conditionals when looking up args