Pretty-printing bugfixes.