r23: Added replacements for pretty output