Fiddle with a few doc strings and test descriptions.
Macros around dynamic binding.