Construction now decoupled from parsing.