Revert "Thinko: The macros must be based on service instead of implementation names"

This reverts commit be58acfe2b8bc453b1b8b10bd6349599730d0d78.
Revert "WIP: Direct service ctor calls at least on Android/iOS"

This reverts commit 15abebbde560e17413f17b16b8b2e9c1f31f01a5.