Simplified some decayed types