Merge branch 'jc/skip-prefix'

Code simplification. * jc/skip-prefix: C: use skip_prefix() to avoid hardcoded string length