Clean up syntax.