More cleanup in the new AJAX code.