Add jsr305, couple of @Nullable annotations

We could invest in some dependency management.
Whoops, fixed.