Gut shibe code.

I should have just made the commit on the CameronVenture branch
directly.