put-this-in-your-pipe: a couple of type fixes.