ENH: better catches for EEG layout

In part addresses #926.