Bug 945826 - Trap overrides and comments. r=jorendorff