Make it just a bit more drop-in compatible.