Closes #1653
Closes #1651
The new macro is available under the name ifmt! (only an intermediate name)