Add a few more "final" qualifiers where we can.