Minor RL registration cleanup

Change-Id: Ia6c779d7f3e83730cab6943f3b89642f37b7bfaa