1. mark field preparedStatement as final
  2. avoid passing null to @NotNull parameter

Comment From: snicoll

Thanks @quaff, I've reverted 1. I agree with the reasoning but we're not consistent at the moment so going in one direction without a clear understanding of what the expectation is is not a good idea.