Improve linkability by using L<> instead of C<>