Fix #33 leftovers.