Some additional cleanups so it compiles again (but still no real functionality).