Pencilneck changes

Only the last two commits, d1c5f0b and 326b0b7, are fixes needing to be pulled; the previous (ad3cd3e) is syncing our fork with upstream, and the prior fix (7a22d10) was obviated by your updates.