Fix up a little abstract stuff.