Add clear concern separation of parsing and expansion.