<+>: Don't insert a space when concatenating empty nodes
Fix @ code blocks

In cases where we had some horizontal space before the closing ‘@’, the
parser would not accept the block as a code block and we'd get ugly
output.
Update tests

This updates tests due to Haddock Trac #271 fix and due to removal of
TypeHoles as an extension from GHC.