Doh, fix short prefix behaviour for unpacks too.