Minor cleanup such as function attributes, etc.