Issue #6, #7: Correctly parse foo[] syntax