Tad more code clean-up.