Move require_once directives, migrate symbols into mapfile string, minor performance improvements