More updates (still broken test_avr33).