Replaced the last typedef by using.