Issue #1574512 by nod_: Selectors clean-up: block.

PR for https://drupal.org/node/1574512