Make sure onPcEquip is also set for Equip script instruction
Some cleanup - move definitions to implementation file