Clean up syntax: use shorter versions of syntax where appropriate.