gustafn
committed
on 20 Oct
provide more type information, factor out common code