Start refactor of LDO syntax checking