Wibbble to last fix to generalisation (again!); fixes Trac #1575