Remove smap structure stuff -- that will become part of the smap
package.
Fix r_sb usage