#1348 Converting more tabs to spaces