Fix more urls not to depend on WP. Continued fix for #632.
Merge pull request #644 from afred/clean-up-more-urls

Fix more urls not to depend on WP. Continued fix for #632.