This is a wide-sweeping change, but I'm not against it.  The nitpick for this commit would be that lines 386 (the old "p.override = true") should be removed since it is no longer doing anything.