More application-track fixes for use with trace executor.