fixing some genericification stuff

Signed-off-by: Matthew Thode <mthode@mthode.org>
bup

Signed-off-by: Matthew Thode <mthode@mthode.org>