Removing two sets of spurious 'inline' declarations in src/