Code cleanup: argument null checks, using "private" where possible, using "final" where possible.