Overly convoluted code is overly convoluted.
Some minor BG cleanup underway.