[fix] Reverting API breakage from the last merge

The last merge changed the API visual style to increase readability.

The manual merging was not done in a proper way however, and some of the
changes from its previous merges were reverted. This commit fixes this.
13 jobs for 28-tests-are-too-permissive-master-broken in 6 minutes and 55 seconds (queued for 33 seconds)