Updating Pair and Singleton to comply with the lastest coding convention update.