Simplify RWS module even more.