Update to match existing formatting / naming / etc.
@deckar01 was right; these aren't needed

I had forgotten that these were internal, they aren't used now, so they
can be safely removed.