Conditional checks against the same value twice

The comment immediately before implies that one of the 'auto's should probably be 'none'.

Error caught by PVS-Studio (see http://www.viva64.com/en/b/0277/)
not sure - why this change is needed?