Regard empty shape as 'valid', fix CppLint warnings.