Steve,

You have an acceptable alternate arrangement. If you drink enough beer from those cups, by the end of the day you don't notice the diesel smell.