Add ES support for older ARM versions.

[clydebarrow]

Support for ES ARM version 3 (not sure what other versions might be affected.) Specifically fixes ECO mode settings.

Plus fix a couple of errors and clean up some code.