Hacking runtimepath seems to be obsolete.
Space.
Added back some quoting mappings.