PR commit for adding support for degree 1 curves

Stick to the same order **everywhere**: degree-1 curves first, degree-3 curves second.