Refactor the eventset setup which is done in papi_internal_init and remove_metric
Refactor the eventset setup which is done in papi_internal_init and remove_metric

We were only partially setting up the eventset in remove_metric (due
to working around papi bug).  Refactor this and ensure it's done properly
both times.

aeg-aeg/pcpfans,aeg-aeg/pcpfans,wuliming/pcp,aeg-aeg/pcpfans,andyvand/cygpcpfans,andyvand/cygpcpfans,prasincs/pcp,adfernandes/pcp,tjanez/pcp,prasincs/pcp,mbaldessari/pcp,edwardt/pcp,aeg-aeg/pcpfans,aeg-aeg/pcpfans,edwardt/pcp,tjanez/pcp,andyvand/cygpcpfans,edwardt/pcp,prasincs/pcp,edwardt/pcp,mbaldessari/pcp,adfernandes/pcp,edwardt/pcp,mbaldessari/pcp,aeg-aeg/pcpfans,wuliming/pcp,wuliming/pcp,aeg-aeg/pcpfans,mbaldessari/pcp,adfernandes/pcp,prasincs/pcp,andyvand/cygpcpfans,tjanez/pcp,wuliming/pcp,prasincs/pcp,aeg-aeg/pcpfans,wuliming/pcp,wuliming/pcp,adfernandes/pcp,wuliming/pcp,tjanez/pcp,prasincs/pcp,mbaldessari/pcp,prasincs/pcp,tjanez/pcp,andyvand/cygpcpfans,tjanez/pcp,andyvand/cygpcpfans,edwardt/pcp,adfernandes/pcp,tjanez/pcp,edwardt/pcp,wuliming/pcp,tjanez/pcp,adfernandes/pcp,mbaldessari/pcp,andyvand/cygpcpfans,adfernandes/pcp,adfernandes/pcp,edwardt/pcp,andyvand/cygpcpfans,prasincs/pcp