Make it ... hmm... more C++-like?