changed defuns to labels in with-codewalker macro