Fix all latest COVs and avoid use of tabs in `i`