Moreover, use a function instead of a macro (like in 0.9-branch)
Partially cherry picked from commit 73ab1cd9