Initial pass at PTR 2.1 support.