Made cpp11 less hacky.