Improved handling of generic picklers
Missing change + extra comments