Cleaned up some old stupid nonsense with CollisionObject's wrapped AWP object.  Don't know why this solution didn't occur to me earlier, but I'm always happy to get rid of old stupid code.  OOP, FTW!