seemed like a good idea at the time... several hours later it was rather
obvious that these are used all over the place making the changes rather
extensive.