Add return expression to final states
OwnerPackage for beans is set to transient, preventing NPEs on workspace
reloading.
Include final state return expression externalization