composition: fix comparison of expiration date and use more readable operators