Wow, that worked with no failed-compiles.