More whitespace issues resolved.