Completed last push

Not all of the last push made it, here's the rest.

See its comments for what this is.