Changes to ucStraight construction. Clean up.