Build cleanup & checkstyle

We need this, but it's going away in a future commit, so -meh-