Add skip guards
Merge branch 'master' into vfunc-with-error
Style fixups
Consitently use proc instead of lambda