Fix labelled links.

Missing split on one, and too greedy split on the other.
Make the BARELINK re a bit more robust

I'm hesitant to make it actually good. Right now it is small
and fast and fairly comprehensible.
pep8 line spacing
Merge branch 'master' into newlib