Further refactoring of the trace simulation capability
Merge pull request #23 from objectiser/refactor4

Further refactoring of the trace simulation capability