Fix for Bug 450415 + Bug 450417
Follow on changes to Bug 450415 to avoid wasteful resolutions.