Some fixes; go back to one-line-per-branch system.