Minor cleanups in rcn_common.h