No dynamic-init fix; merge goof.