moved canonical guesses back into user config section of config.h