Fix non-string defaults and when to calculate return values.

Also some spaces added to make things line up.