Make before-wait-callback a keyword arg