Rewrites.

Better code consistency.