Simplify code.
Remove useless template parameters.
Reinstate arcs and nodes tests.