Minor reshuffling in NEST backend