Bump base version bound to < 4.8
Update constraint on tests too
Merge branch 'master' into wip
WIP. Finally realised that synthesiselStaged was what I have been
puzzling over for days