We were overly matching in some cases by not starting with a slash. This updates a few other cases too.
The core package could contain non-functions, so we might as well move it upwards.