2130: Fixed whitespace handling of imported dfxps