Preparations for indentation warning system revamp