Remove drop virtual hackery

Yay for struct parameter constraints!