Core: Remove whitespace (again, again, ...)