RLIB-11 fix mismatching function signatures. rlib now builds cleanly.