(core+platform) fixes to system_collapse, yet another namespacing refactor, hopefully fixing things this time around.