Improve usage of the final keyword.