Tweaked API to minimise changes to existing drivers even further.