Cleanup: Correct Avalon master double-access due to waitrequest