WORK-IN_PROGRESS
Bring simulator in line with native calling conventions.