Cleaning up the AO extension code.