82af5353b0
working on this code, or things that I think are layering violations. Plus a minor whitespace cleanup in one place while I'm at it.