Further progress with porting the effects system