Bug #994. Indentation updates