At the same time, simplify the interface a bit by not using a tuple.

Reviewed-by: killerfoxi, ultrotter