Silenced warnings.  Also, previous commit was unfinished.