Consider keys ending to : as an expression
Merge branch 'dynamic-fix'