Fixes coding style in the last 4 commits (uses S:: instead of Session::).