Fix powerline problems, with code cleanup. ;-)