Remove expr as a dependency, fix a stupid bug