More minor cleanup of Layer.