Fixed expression dependency crap.