Merge "Cleaning up encode_sb() and encode_b() functions."