Prepare for upcoming dewi changes

Signed-off-by: Frank Terbeck <ft@bewatermyfriend.org>