This removes some needless indirection and duplication. Signed-off-by: Mans Rullgard <mans@mansr.com>