Adjusted syntax entities to directly resolve