Various minor fixes/cleanup to make 'script_load_addons' test work again.

Note about Amaranth changes: cycles check has to be live in some cases (global
variable is set only once, on first import, cycles might be disabled later and then
unregister would fail).