fix skipped tests; resolve a warning; progressive tidying

It's called in a static manner; only needs to run once on any given page. This was to fix a PHP warning.