Handle idioms in a better way (in case we should add others)