Style cleanup, new stubs.