5/1/14: did some cleanup in the fallout of last nights re-factoring