Modulating Surrogates for Bayesian Optimization