Tidy up channel#shift