A bit more removal of redundant code.