Fix elaboration problems.