Tweak to use latest documented API, take advantage of explicit cast member ordering.