Add std::decay<> here and there