loki: Make style and dependency fixes.