Remove the apparently unused fasttrap_probe_ptr and associated code.
Merge branch '20131020-fasttrap-trap-cleanup' into markj-develop