This reduces divergence with the gjs coding style, and brings us closer to dropping the legacy style.