More work on bug #8081.  The AVR stuff is done now.