Enhancements to the #2090.