Simplified line-marker code. Cleaned up.