Move to new syntax to fix compilation.

Similar to #241.