Some cleanup -- don't use splitfields/joinfields, standardize

indentation (tabs only), rationalize some code in urljoin...