Code cleanups; removing some unused extra parameters.
Fixed case where initial preferred size is not available, e.g. on first
designer usage.