- style fixes; removing unnecessary variables, etc.
- use more let() statements instead of local scoping things
  This is an attempt to fix two specs that clobber eachother, but it
  did not fix anything.
  Still, this is easier to read now.