Added an implementation limitation where an assertion was previously failing
Handle more constant expressions
Handle more constant expressions
Merge branch 'master' into llvm-trunk