master: Squashed minor bug.