hwlocality

931c20fc - Accept normal depths in functions that take Depth + minor style fixes