More message factory cleanup.