add expansion for some conditionals