Amend "refine clumsy code in elpa".