(Just some purely aesthetic code changes.)