Make glass and obsidian glass framed to suit More Blocks glasses; some code cleanups.