Removing hard-coded references to CBC form in favor of ability to plug in form specifications; cleanup.