Misc cleanup; mostly docblock updates.