Fix pepID metavalue usage

separated/squashed commits

cccd4a1 should be removed for release 1.12 -- I'll open a ticket.