Also, changing logic so that the SimpleAnnotationReader is no more the
default one. An additional parameter for the method will allow using it.
The CS fixes that were additionally implemented (along with other minor changes
that do not affect BC compatibility are caused by a CS sniff via IDE.