Make all math expressions block expressions.
Correct dependencies.