From Colin McDonald, "Added some missing updates to the serializer static build support."