Making default hostname computation more consistent with other default values (issue #21).