Stop using constant in spec
Don't create procs unless they are needed

Also, take advantage of the fact that (&nil) is like passing no block.
Add 4.1.0 betas to Travis CI build