XCore target: Refactor LR handling