2007/03/13 08:42:14 fs 1.25.30.1: some slight re-factoring (class/method renaming), plus some rudimentary fix for #b6532894#