Followup cleanups after picking EN changes