gustafn
committed
on 04 Aug 20
handle toplevel and other forms as well