Fix a few silly bugs introduced by removing blank?.