This is in preparation for following changes.

Signed-off-by: Mans Rullgard <mans@mansr.com>