Better returned shapes and one-way tramlines