More work towards freeing old ModelActions