Null annotations + cosmetics