Argument validation cleanup, [NotNull]