This way maintaining the C-API is a bit less tedious job and makes code cleaner to follow. Should be no functional changes.
