[master 2/2] Add EDD 4 code and some logging cleanups.