Hints for static code analysis added
Headers/dict exchangability improved