VAPI: More fixes for r_bin.