Extend existing pretty formats to more core macros