Not sure if my 10 cents are worth anything given that I haven't spent much time with this code recently, but I feel very uneasy diverging from the generic path in this area.