More cleanup
Simplify proposed API. Start of two-bit tiles.