ApacheDSContainer: fix imports, whitespace, cruft.