Move few things around to fit nicely in GitHub's code-view