Wire component bake into BakeShell.

Fix merge conflict mistakes.