Make follower portraits faux-square.

Also fix a bug.