added more /*@null@*/ and const annotations