Clean up some unnecessary @SuppressWarning's