Merge "edify: Some clean-ups to libedify."