Work on issue #18. Only a minor problem remaining : order of annotation processing in a rare case.