Rebase my own modifications on top of Far McKon's.