mutable and decltype improvements