volt: Remove some constructs that volt has trouble parsing.