Minor syntactic cleanup.