Now compiles with only one warning.