Updates from IDE-recommended code inspection.