Got rid of all the dang brackets, resolves #24