Refactor|Map Renderer: Short circuit drawing of selfreferencing line sections earlier

Plus more cleanup.