This looks good modulo my minor comments and using and testing thenew code path for the !mq case as well. Please also Cc the Avagopeople on your next submission.