Rework AVR support to make it easier to get it right.