Remove dependency on lines from type and currency.

issue3555
review2311002