A tiny bit saner bench and some minor changes. Should compile with 2.10.4 and 2.11.1