Zero warnings

Redo of #159 to target the branch we're actually using.