Review and fix manifest ordering; move some functions up the load order to allow earlier use

--HG--
extra : rebase_source : 9d824ce1c54b0a7ff1e45c9f29f7c89a1a512b56