stairway: inline fixes for gcc 4.7.