Clean-up syntax based on 55bdd7e commit.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'