Cleaned up, finishing forward-port to new blocklyeditor

Change-Id: Ifbe62d978139eefc802fd9cfd807478a24ed8d3f