Now compiles with no warnings.