Note: Not sure this is the right way to do compat, but it makes the headers consistent with the implementations.