(cosmetic refactoring: whitespace, imports, extract vals, etc)
Remove warning to enable -feature flag