Kevin tried doing that in #73 but we discussed and decided to keep things the way they are for now.