Nicer way of trimming, plus an update from push_chars to push