Cleans up common so that we can enable warnings as errors.