Fix line numbers and verify with other types. Lax on TODOs so far.