Cleaned up to work with -Wall.