This was a fun episode. And that was my first thought when I saw Bruce Davison too. My only problem with that is that it's getting to a point now where I can figure out who's gonna be the bad guy based solely on who the guest actors are.
Although, as it turned out, Davison was NOT actually the killer. He was just involved in the cover-up.