Don't bother futzing with an empty element system

This is probably a trivial improvment to efficiency in opt mode, but
more importantly it fixes some regressions in devel mode.