drop extra <p>, add missing paren for decltype, drop extra char