Remove some X-Face cruft and check after realloc