Cleanup and fixes

A bunch of little fixes and cleanup.

Probably the most significant is using a common deflate(slave) function to end slave inflation, which is neater and also avoids a few unusual bugs (for instance, selling a slave that used to be a milk source for a slave that got deflated and reinflated with something other than milk, would deflate that slave unnecessarily again).