Cleanup code: step 3: fix warnings.