Okay, I'll play around with this and do another pull request. garbas was writing an automatic p.a.contenttypes upgrade step, I'll write tests for that at the same time.