Yeah, I didn't look carefully for all occurrences yet, this began as just sort of a "proof of concept" to see if this change could be made to serve the site and pass the tests.