CID-1254841 removed unused var
CID-1254842 use boxed constant instead of true