Improve SuppressWarnings usage #494