Accumulated minor cleanups

If there are objections I could break this down further.