Cleanup: Tweaks to AvalonMM drivers