Core/Scripting: Misc Cleanup.