Companion PR for `Various small improvements to service construction.`. (#1472)

* Initial commit

Forked at: 9637baea
Parent branch: origin/master

* Refactor

* Refactor

* Remove macro

* WIP

Forked at: 9637baea
Parent branch: origin/master

* CLEANUP

Forked at: 9637baea


Parent branch: origin/master

* small fix

* fix for browser

* Switch branch

* Rewrite service builds

* Update branch

* Fix sp-core branch

* Switch branch back and update

Co-authored-by: Cecile Tonglet <[email protected]>