More of the previous two commits.