Made header files more consistent.
Now they all re-declare the methods they will override, which is apparently better Objective-C style.