Re-order conditions.
Remove debug message (...).