improved edition support for primer et al