Fixing the pretty printing for the cases we care about for now.