Since we agree on the first part I have divided it into two patches.

Amos.