Minor cleanup items found during rename work