More missing @NotNulls
Issue #28: add TODO markers