Simpler expand implementation.