This second part of API replacement in particular lengthens the code,
but I hope the new expression will be easier to understand at least.