Minor cleanup for the fix for Bug 448954