Cleanup some scriptlets

[candela97]

See #1944, essentially the dynamicstore scriptlet should be inserted earlier to avoid the promise potentially never resolving. Should be ideal even if the root cause is fixed.

[tfedor]

Merged with the register() change reverted