Fix syntax issues ready for v38 Co-authored-by: Robert Hunt <Freely.Given.org@gmail.com> Reviewed-on: #1591