This still uses the deprecated function interface, but at least allows to get rid of the function implementation. Adjusting the assemblers is a separate task.