Fix Pickable

This pull request attempts to fix #1570 and cleans up the Pickable plugin. It also reverts a change made in 038c68fe21456c71830690e84f6de734b9015ad4, see the inline comments added today.