Al Neri killed the girl (remember when Tom motioned to him to leave him and the Senator alone?), so hence, it was a set-up, just like you guessed.