a little cleanup, esp. in defineq