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.