r2377 - toss things around to let more config lines be generated by decoder script