Various fixes to bring notation in line with our new draconian conventions :)