Syntax cleanup.