I made the change, just for the sake of re-using Pylearn2 code. It'll make things easier to maintain in the long run.