CIMD2 dlr-mask?

Hello!
I'm taking the dlr-functionality into use with a CIMD2 SMSC-connection.
In CIMD2 the dlr-bits are defined in the following way:
1 - temporary error
2 - validity period expired
4 - delivery failed
8 - delivery successful
16 - message cancelled
32 - message deleted by the operator
64 - first temporary result

The kannel defined dlr-bits are:
1: Delivered to phone
2: Non-Delivered to Phone,
4: Queued on SMSC
8: Delivered to SMSC
16: Non-Delivered to SMSC

The kannel 1.4.0 driver sets CIMD2 bits 2,4 and 8 if kannel bits both 1 
and 2 are set, otherwise no bits are set.
That means that it is not possible to get CIMD2 delivery successful 
report at all.

To fix this there are two options:
1) To map kannel dlr-bits to CIMD2 dlr-bits the best possible way
2) Pass the dlr-mask as such to CIMD2
Which one do you prefer?
Is there something that has to be taken into account?

Regards, Matti