#18?????

I think this is what you had in mind for #18 but it does not seem to
make it much shorter so I am not sure.