Cycles-Bake: [review] cleanups - as per Campbell Barton suggestions
Cycles-Bake: [review] using MACRO in get_shader_type()