Changing windows to just return a userdata; part of #151.