Progress rewriting runtime picklers (unfortunately necessary)