PIVOT-799, better alignment with Java 7 not null check for method arguments, a little cleanup, and some small enhancements and related tests