@miguel, if you want those changes to go into Lazarus code, please submit a bug report with a patch containing the changes...