Port to linear.

Standard changes, didn't see any issues.