Agreed on consistency being most important. Went ahead and outdented the scope declarations, though.