Fix up a few strict warnings in RHAdditions.