Oasis: Cosmit: address bthirion's comments.