Removed singular SPI methods on ServiceProvider.
Moved annotation to RI.