And ensure no other warnings will creep in by using
an 'if' statement instead of a #if.

Change-Id: Ic0ccc481d375de3b3cedc7e3e5530f6f9b011c37