Added a useful type accessor, removed old placeholder code