Optimize cond expansion
Move List and String deprecations to new mechanism