partial event cleanup related to last core commit (commit: 5660498)
player trades with merchant - determine option and scope expansion (commit: ae5110d)