Code cleanup for the upcoming Kido support.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>