This patch is admittedly loose. It was simply easier to apply coding conventions like "final" across all files rather than just the changeset.