Revamp the parsing of control files