Improved ECB & CBC modes (work in progress).