For debugging purposes, mainly. Fix also some casts that worked only
with SwModify being the first base (there seems to be no real
requirement for it being first).