More fixes for declval