Summary: Reduce the amount of related code replication and improve pretty printing.
Reviewed-by: jmasa