Cosmetic changes - added final to several args.