Update actor/function layouts, fixes #5394