REL-1501: Marked a bunch of variables as final.