SI-8092 Review cleanup, no qq

No crazyquoting. Use global.abort on total fail.