Re-use the preformatting from the source code to layout method signatures more cleanly.
Closes #285
Closes #261