https://bugs.freepascal.org/view.php?id=37399 - made the refactor patch and tested it on i386-win32 and x86_64-win64, as well as cross compilation with "make fullcycle" to catch the most blatant of errors. It will require testing on other platforms though. Gareth aka. Kit