Improvements to special case handling.