Slightly syntax cleanup.