Separate standard syntax from tests for corner cases.

Add drawer closing entry structure.