Merge stuff from notadecent.