More const_fold changes/todos for static/global initialisation