Continue refactor of LDO syntax checking